From 4a20f00e0c4b24b72c29315a78924d19a04315d2 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 10 Dec 2025 23:56:06 +0100 Subject: [PATCH] makebranch: update openwrt-keyring package with target version On branching for a new version, also update the openwrt-keyring to install the specific .pem key. Signed-off-by: Christian Marangi --- makebranch.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/makebranch.sh b/makebranch.sh index 0e39749..7a82de6 100755 --- a/makebranch.sh +++ b/makebranch.sh @@ -138,10 +138,15 @@ sed -e 's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$bas package/base-files/image-config.in > package/base-files/image-config.branch && \ mv package/base-files/image-config.branch package/base-files/image-config.in +sed -e 's!openwrt-.*.pem!openwrt-'"$version"'.pem!g' \ + package/system/openwrt-keyring/Makefile > package/system/openwrt-keyring/Makefile.branch && \ + mv package/system/openwrt-keyring/Makefile.branch package/system/openwrt-keyring/Makefile + git commit -sm "${distname:-OpenWrt} v$version: set branch defaults" \ feeds.conf.default \ include/version.mk \ - package/base-files/image-config.in + package/base-files/image-config.in \ + package/system/openwrt-keyring/Makefile git --no-pager log -p -1 git checkout "${prev_branch#refs/heads/}" -- 2.30.2